pull minizip from configure flow. (#339)

while it was planned to use minizip those
plans were never completed and it was unused.

zlib/contrib/minizip appears to be unmaintained.
some issues e.g. #338.

diff --git a/Makefile.in b/Makefile.in
index 67cd5a86e4e4354d86a4f22424204c30eaf4c361..6f2194386a7ab802febcb66cd054c74b65753441 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,9 +107,6 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
 
 SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
 
-MINIZIP=zlib/contrib/minizip/zip.o \
-       zlib/contrib/minizip/ioapi.o
-
 ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
        zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
        zlib/uncompr.o zlib/gzlib.o zlib/gzclose.o zlib/gzread.o \
@@ -124,7 +121,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
     src/core/textstream.o \
          src/core/usasciicodec.o \
          src/core/xmlstreamwriter.o \
-         $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ @MINIZIP@ $(FMTS) $(FILTERS)
+         $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
 OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
 
 DEPFILES = $(OBJS:.o=.d)

diff --git a/config.h.in b/config.h.in
index 9e84d0f3a48188dcc24051cb533afbcb7a4a659a..70f190cccdd7f5b2068db9a40ad881b00bb65507 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -21,9 +21,6 @@
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
-/* Define to 1 if you have the `minizip' library (-lminizip). */
-#undef HAVE_LIBMINIZIP
-
 /* Defined if you have libusb */
 #undef HAVE_LIBUSB
 
@@ -69,9 +66,6 @@
 /* 1 to enable as many formats as possible */
 #undef MAXIMAL_ENABLED
 
-/* 1 to inhibit our use of libminizip. */
-#undef MINIZIP_INHIBITED
-
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 

diff --git a/configure b/configure
index 95e230beb5d53dcf2fd9a3fc7343ee705296d513..ca9e4a72b4673db8ebbec1258095571e979c629f 100755 (executable)
--- a/configure
+++ b/configure
@@ -642,7 +642,6 @@ ac_ct_QMAKE
 QMAKE
 RC
 FILEINFO
-MINIZIP
 ZLIB
 ZLIB_CPP
 FMTS
@@ -701,6 +700,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -728,7 +728,6 @@ enable_csv
 enable_most
 enable_filters
 with_zlib
-with_libminizip
 with_doc
 '
       ac_precious_vars='build_alias
@@ -781,6 +780,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1033,6 +1033,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1170,7 +1179,7 @@ fi
 for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
                datadir sysconfdir sharedstatedir localstatedir includedir \
                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir
+               libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1323,6 +1332,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1367,8 +1377,6 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-zlib=(included)|system|no
 
-  --with-libminizip=(included)|system|no
-
   --with-doc=DIR          Path where the documentation will be stored.
 
 Some influential environment variables:
@@ -5729,80 +5737,6 @@ esac
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support zlib's minizip" >&5
-$as_echo_n "checking whether to support zlib's minizip... " >&6; }
-
-# Check whether --with-libminizip was given.
-if test "${with_libminizip+set}" = set; then :
-  withval=$with_libminizip;
-fi
-
-case $with_libminizip in #(
-  "system") :
-
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zipOpen64 in -lminizip" >&5
-$as_echo_n "checking for zipOpen64 in -lminizip... " >&6; }
-if ${ac_cv_lib_minizip_zipOpen64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lminizip  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char zipOpen64 ();
-int
-main ()
-{
-return zipOpen64 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_minizip_zipOpen64=yes
-else
-  ac_cv_lib_minizip_zipOpen64=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_minizip_zipOpen64" >&5
-$as_echo "$ac_cv_lib_minizip_zipOpen64" >&6; }
-if test "x$ac_cv_lib_minizip_zipOpen64" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMINIZIP 1
-_ACEOF
-
-  LIBS="-lminizip $LIBS"
-
-fi
-
- ;; #(
-  "no") :
-
-
-$as_echo "#define MINIZIP_INHIBITED 1" >>confdefs.h
-
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- ;; #(
-  *) :
-
-       MINIZIP="\$(MINIZIP)"
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: using included version" >&5
-$as_echo "using included version" >&6; }
- ;;
-esac
-
-
 case "$target" in #(
   *-*-mingw32*) :
 

diff --git a/configure.ac b/configure.ac
index 02f3526a0e37628ae72a1424b0f1902fb0c79161..8755403f556cc32529b5db96ef652f1f95dc6413 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -128,22 +128,6 @@ AS_CASE([$with_zlib], ["system"], [
 AC_SUBST(ZLIB_CPP)
 AC_SUBST(ZLIB)
 
-AC_MSG_CHECKING([whether to support zlib's minizip])
-AC_ARG_WITH([libminizip],
-       [AS_HELP_STRING(
-               [--with-libminizip=(included)|system|no],
-               [])])
-AS_CASE([$with_libminizip], ["system"], [
-       AC_CHECK_LIB([minizip], [zipOpen64])
-], ["no"], [
-       AC_DEFINE(MINIZIP_INHIBITED, 1, [1 to inhibit our use of libminizip.])
-       AC_MSG_RESULT([no])
-], [
-       MINIZIP="\$(MINIZIP)"
-       AC_MSG_RESULT([using included version])
-])
-AC_SUBST(MINIZIP)
-
 AS_CASE(["$target"], [*-*-mingw32*], [
        FILEINFO=fileinfo.o
        AS_IF([test "$CC" = "gcc"], [